Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 17 Aug 2010 22:47:11 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 17 Aug 2010 22:47:11 +0000 (22:47 +0000)

Trivial merge